Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Merge Nyano up to 17/07 #89

Closed
wants to merge 440 commits into from

Conversation

DebugOk
Copy link
Contributor

@DebugOk DebugOk commented Jul 17, 2023

About the PR

Beeg merge, will have to do some testing and check all the changed stuff

Changelog

🆑

  • add: Merged around 428 commits, report any bugs or issues in our Discord

EmoGarbage404 and others added 30 commits July 16, 2023 03:31
(cherry picked from commit ea767b7)
(cherry picked from commit 910c2da)
(cherry picked from commit 9fc4fc6)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 763f604)
* Fix renamestation command not working

* Console completions for station commands

(cherry picked from commit 50c278b)
(cherry picked from commit c1a971f)
(cherry picked from commit 1dde5f3)
(cherry picked from commit 6485dba)
Back in 2019, throw was set to Ctrl+Click so canFocus was set to true. It wasn't removed when the hotkey changed from left click to Q.

(cherry picked from commit 7f203be)
(cherry picked from commit 3fa99b8)
(cherry picked from commit f14f09c)
(cherry picked from commit 26e5249)
(cherry picked from commit 4bd6f92)
* Update janitor.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Update janitor.yml

friction gaming

* tweak cart friction

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

* comment

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
(cherry picked from commit 9792116)
(cherry picked from commit bdbd01f)
(cherry picked from commit 4890778)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit f5bd24f)
@github-actions github-actions bot added Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files labels Jul 17, 2023
DEATHB4DEFEAT and others added 12 commits July 17, 2023 17:30
This reverts commit ae03910.

There are issues with this commit affecting users of Visual Studio Code.
* initial "working" commit

* decent rendering

* clean up texture a bit

* looking better

* i love ui 😄

* Start bookkeeping

* Glimmer graph just worksTM

* okay, clipping works

* calculate your own damn formatting instead of making the server do it

* name constants, add interval buttons

* wtf, interval buttons work I guess

* add sync button

* seperate out cartridge RSI

* adjust server namespaces

* seperate out client namespaces

* do loc

* woops, placeholder value

* cleanup

* final cleanup after testing

* magil review and fix
Changes her name to Sophia too.
* Adds Skub Klub

* Update timing and design

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
* judas purge pt 1

* fix lid purge

* further purge

* purge skub

* weh purge

* gar purge

* gachi purge

* spare the lizard plushie
* get some basics thrown in

* add event

* glimmer reading topic completed

* replace speech sounds

* add more topics

* add a bunch of responses

* add responses for a bunch of morphotypes

* new line

* fix minor grammar inconsistency

---------

Co-authored-by: Vordenburg <114301317+Vordenburg@users.noreply.github.com>
@DebugOk DebugOk closed this Jul 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files
Projects
None yet
Development

Successfully merging this pull request may close these issues.